Merge from trunk.
authorJan D. <jan.h.d@swipnet.se>
Wed, 6 Jan 2010 14:33:57 +0000 (15:33 +0100)
committerJan D. <jan.h.d@swipnet.se>
Wed, 6 Jan 2010 14:33:57 +0000 (15:33 +0100)
commitdd00c7014f8d71c5559d8dbba85e4b24071fc939
tree8948dc746766d45c5f2e9c8f3fd9368797bf33e9
parentf5fc622c1167b0c4f76339f8534f1908a7e7e3d1
parent438d470ff7897fc60748be82fe06bffe12eb617f
Merge from trunk.